Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of docs: specify manual server metadata intervention into release/1.15.x #18480

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Backport of docs: specify manual server metadata intervention into release/1.15.x #18480

merged 1 commit into from
Aug 16, 2023

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #18477 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@loshz
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.

Description

Updates docs to specify what operator intervention is needed to restart a stale server.

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/server-metadata-docs/rationally-helping-kingfish branch from 528688d to 1e631c5 Compare August 16, 2023 15:46
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/server-metadata-docs/rationally-helping-kingfish branch from 1e631c5 to 528688d Compare August 16, 2023 15:46
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 16, 2023 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging August 16, 2023 15:46 Inactive
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Aug 16, 2023
View reviewed changes
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul August 16, 2023 15:57 Inactive
@loshz loshz force-pushed the backport/loshz/server-metadata-docs/rationally-helping-kingfish branch from 61016cc to 1b229f5 Compare August 16, 2023 16:42
@loshz loshz marked this pull request as ready for review August 16, 2023 16:42
@loshz loshz requested a review from a team as a code owner August 16, 2023 16:42
@loshz loshz enabled auto-merge (squash) August 16, 2023 16:42
@loshz loshz merged commit bcf43ff into release/1.15.x Aug 16, 2023
105 checks passed
@loshz loshz deleted the backport/loshz/server-metadata-docs/rationally-helping-kingfish branch August 16, 2023 17:00
@jjti jjti mentioned this pull request Aug 28, 2023
Closed
@jira jira bot mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@loshz loshz Awaiting requested review from loshz

Assignees

@loshz loshz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hc-github-team-consul-core @hashicorp-cla @github-team-consul-core-pr-approver @loshz